[IA64] Remove more useless code

Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com>

diff --git a/xen/arch/ia64/vmx/mmio.c b/xen/arch/ia64/vmx/mmio.c
index 3ffaf6360dc75160253b5db184c0bceed1fff93b..fbfd3bbfec616f5d5d27ddb1e1469d45cc50b9c5 100644 (file)
--- a/xen/arch/ia64/vmx/mmio.c
+++ b/xen/arch/ia64/vmx/mmio.c
@@ -270,11 +270,9 @@ static void legacy_io_access(VCPU *vcpu, u64 pa, u64 *val, size_t s, int dir)
 
 static void mmio_access(VCPU *vcpu, u64 src_pa, u64 *dest, size_t s, int ma, int dir)
 {
-    struct virtual_platform_def *v_plat;
     //mmio_type_t iot;
     unsigned long iot;
     iot=__gpfn_is_io(vcpu->domain, src_pa>>PAGE_SHIFT);
-    v_plat = vmx_vcpu_get_plat(vcpu);
 
     perfc_incra(vmx_mmio_access, iot >> 56);
     switch (iot) {

diff --git a/xen/arch/ia64/vmx/vmx_vcpu.c b/xen/arch/ia64/vmx/vmx_vcpu.c
index 06c78e70c3936e74b79416b43bcdd2f352683ddf..8b0a898f2fa1d770fead805420faf5d391b931ea 100644 (file)
--- a/xen/arch/ia64/vmx/vmx_vcpu.c
+++ b/xen/arch/ia64/vmx/vmx_vcpu.c
@@ -151,12 +151,6 @@ IA64FAULT vmx_vcpu_cover(VCPU *vcpu)
     return (IA64_NO_FAULT);
 }
 
-struct virtual_platform_def *
-vmx_vcpu_get_plat(VCPU *vcpu)
-{
-    return &(vcpu->domain->arch.vmx_platform);
-}
-
 IA64FAULT vmx_vcpu_set_rr(VCPU *vcpu, u64 reg, u64 val)
 {
     ia64_rr oldrr,newrr;

diff --git a/xen/include/asm-ia64/vmx_mm_def.h b/xen/include/asm-ia64/vmx_mm_def.h
index 4736908fda94537e7709a997990fd09b0d63c82b..f3edd016b5b2689e2146aa007c508ded3b4c0e7e 100644 (file)
--- a/xen/include/asm-ia64/vmx_mm_def.h
+++ b/xen/include/asm-ia64/vmx_mm_def.h
@@ -120,22 +120,6 @@ typedef enum { INSTRUCTION, DATA, REGISTER } miss_type;
 //typedef enum { MVHPT, STLB } vtlb_loc_type_t;
 typedef enum { DATA_REF, NA_REF, INST_REF, RSE_REF } vhpt_ref_t;
 
-typedef enum {
-       PIB_MMIO=0,
-       VGA_BUFF,
-       CHIPSET_IO,
-       LOW_MMIO,
-       LEGACY_IO,
-       IO_SAPIC,
-       NOT_IO
-} mmio_type_t;
-
-typedef struct mmio_list {
-       mmio_type_t  iot;
-       u64             start;  // start address of this memory IO block
-       u64             end;    // end address (include this one)
-} mmio_list_t;
-
 static __inline__ uint64_t
 bits_v(uint64_t v, uint32_t bs, uint32_t be)
 {

diff --git a/xen/include/asm-ia64/vmx_platform.h b/xen/include/asm-ia64/vmx_platform.h
index 4a3dc2786f35e70e851229426eb3d4c7ccab426b..8909a6058b9d179ecdde550cdd6b501cd8ad6598 100644 (file)
--- a/xen/include/asm-ia64/vmx_platform.h
+++ b/xen/include/asm-ia64/vmx_platform.h
@@ -43,7 +43,6 @@
  * it is not used on ia64 */
 #define OS_TYPE_PORT    0xB2
 
-struct mmio_list;
 typedef struct virtual_platform_def {
     unsigned long       gos_type;
     unsigned long       buffered_io_va;
@@ -52,7 +51,6 @@ typedef struct virtual_platform_def {
     unsigned long       shared_page_va;
     unsigned long       pib_base;
     unsigned long       params[HVM_NR_PARAMS];
-    struct mmio_list    *mmio;
     /* One IOSAPIC now... */
     struct viosapic     viosapic;
     struct vacpi        vacpi;

diff --git a/xen/include/asm-ia64/vmx_vcpu.h b/xen/include/asm-ia64/vmx_vcpu.h
index 72805b28f8b617f9c51559740bb94a1c9d5e354d..def7a0684576d6fd3f33917d520def2e6ead1108 100644 (file)
--- a/xen/include/asm-ia64/vmx_vcpu.h
+++ b/xen/include/asm-ia64/vmx_vcpu.h
@@ -107,7 +107,6 @@ extern int is_unmasked_irq(VCPU * vcpu);
 extern uint64_t guest_read_vivr(VCPU * vcpu);
 extern void vmx_inject_vhpi(VCPU * vcpu, u8 vec);
 extern int vmx_vcpu_pend_interrupt(VCPU * vcpu, uint8_t vector);
-extern struct virtual_platform_def *vmx_vcpu_get_plat(VCPU * vcpu);
 extern void memread_p(VCPU * vcpu, u64 * src, u64 * dest, size_t s);
 extern void memread_v(VCPU * vcpu, thash_data_t * vtlb, u64 * src, u64 * dest,
                       size_t s);